Merge "Reduced the impact of "synchronized" statements am: eb50a39e98 am: c6a3503100" into nyc-mr1-dev-plus-aosp
am: b235a96091
* commit 'b235a96091983e139cdc8ff73147ff7aa291bea4':
Change-Id: Ica7b123553d2cec7c74cceed0526f019db718233
This commit is contained in: