Merge "Add some @Nullable annotations to SharedPreferences"