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

* commit '3714af53e7cd26ef21c05a88613a9d79ebf22bc8':
  Tweak preference adapter changes

Change-Id: Ib36efb94f44721ed24f4f144e3ff5886b1fc27f1