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

Change-Id: I673f1cf19b0ab168557a2776c9d50ddd1baea9c7