Merge "Disable strict mode check on shared preferences to avoid logspam" into nyc-dev am: 3f2a995bfc am: a342b060f6
am: d5996b0a25

* commit 'd5996b0a25ad970cbc4ebdc5567e499e22f815d7':

Change-Id: I53681f86181e12d2dd1fb6a5517adea89b7c50ee