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