am: 3b46f0e8 * commit '3b46f0e8': Unlocked access of mServices is bad. Change-Id: I78bbd3bb5f54b512740ce72e5168c605d2902fa5