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

Change-Id: Ifd52e21336a32ecd195e61336ac90777ba990925