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

Change-Id: I7b97a4777e9fca08c245d5b278c68744746371f7