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

* commit '3f2a995bfc639b1b7295e98cd129f46c0d692ddc':
  Disable strict mode check on shared preferences to avoid logspam

Change-Id: I0780dbcb20fb1cdb9a6ccbc224cdd091b13bf28e