Merge "Re-apply "Synchronize reads of static members."" am: c7784e83eb am: 333ec45713" into nyc-mr1-dev-plus-aosp