Merge "Don\'t evict SharedPreferences when migrate no-op." into nyc-dev
am: 19c7699309

* commit '19c7699309f7aa6ce487a8db353ea24acf94c4ca':
  Don't evict SharedPreferences when migrate no-op.