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

* commit '98290fe6a7d358b46124b5620f166a2bf446b80c':
  Disable strict mode check on shared preferences to avoid logspam

Change-Id: I125be601efb8c1993556eb9b6f4db920d89553c5