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