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

* commit '3714af53e7cd26ef21c05a88613a9d79ebf22bc8':
  Tweak preference adapter changes

Change-Id: Ifa3861ab9a8fddd705ac5814c96ef39c99b8b677