Merge "Merge changes from topic 'backportSharedpreferencesSpeedUp' into nyc-mr2-dev am: 61b0f84005 am: fddf68261e"