Merge "Change SharedPreferences.Editor.commit() to apply()" am: a7069d50c4 am: 6bd041ff44
am: 7cb97036e0

Change-Id: I850b821fdd8cdea646d6724faf29416b225e485c