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

Change-Id: I0d2d0cffe3a78a843ae97d3946bbbbd7d4138044