Merge "Make SharedPreferences check with higher precision" am: 9ca31879 -s ours am: 79d7319d -s ours am: 3e0c2b73 -s ours Change-Id: I4e956376312317c868db00a3c15f7ec4a33bc8b6