Merge "Tweak preference adapter changes" into nyc-dev am: 3714af53e7
am: 519f1e93b7

* commit '519f1e93b733e562fbb9c9efe3464a6fbad6a726':
  Tweak preference adapter changes

Change-Id: I9f29670aaa4b8785a525078cd2d4a7b87cef4039