Merge "Merge "Tweak preference adapter changes" into nyc-dev am: 3714af53e7 am: 69fcd30402" into nyc-mr1-dev-plus-aosp
am: 574c0312b6

* commit '574c0312b61b53c7f189351290ee20f8bf8a5005':

Change-Id: I008311c6fc9dda3619c07ea9c24536fd4ba6b871