Merge "Merge "resolve merge conflicts of e1a60983 to nyc-dev-plus-aosp" into...
Merge "Merge "resolve merge conflicts of e1a60983 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp am: 152ce744" into nyc-mr1-dev-plus-aosp
am: 2cbe99f8
* commit '2cbe99f8':
Reduced the impact of "synchronized" statements
Change-Id: Id1fd953de0ebacfc515dacbb1e368faf503a2be4