Merge "Make SharedPreferences check with higher precision"
am: 9ca31879b0  -s ours

Change-Id: Ie7065c2281bdf6a97af69c2d758d4c2ff55956ae