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

* commit 'a342b060f643948c2491c9fd6db4ec07b9f4981c':

Change-Id: I3100b6e1ae6a980e5ad3339feaf679ab2b348576