Merge "[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms" into nyc-mr2-dev
am: 65924030d6

Change-Id: Ib41328d4c9759d521cf2b27327ca0bc0baa5591a