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

* commit '536286ffdde88de70ff1133688fbbb3a0df53b32':
  Tweak preference adapter changes

Change-Id: I94fd81adfa6c28f5fd470959e1eaaac4e070bf23