Merge "Reduced the impact of "synchronized" statements am: eb50a39e98 am: c6a3503100" into nyc-mr1-dev-plus-aosp