Merge "Merge "Merge changes from topic 'backportSharedpreferencesSpeedUp' into nyc-mr2-dev am: 61b0f84005" into nyc-mr2-dev-plus-aosp am: 13b2cfdfdf"