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

* commit '69fcd30402d776187c823b7e512cc52af4e7d4f6':
  Tweak preference adapter changes

Change-Id: I114604b273dfde70a2969722e3ac47df47d0e859