Merge "Fix issue #5435470: SharedPreferencesImpl should read from file..."