Merge "Unlocked access of mServices is bad." into nyc-dev
am: d9599faf6b

* commit 'd9599faf6b872fb5e1db72f7239b21d05050bd47':
  Unlocked access of mServices is bad.

Change-Id: Ibbaddadfdb3589765b2eee941b19b8dde6c749fa