Merge "Fix pref availability for search" into nyc-dev am: 8eaa3de931
am: 6ed9be1352
am: ec57cbf8fc
* commit 'ec57cbf8fcf5869e7de8bbd382bfa5e2215f9567':
Change-Id: Id889bcfcaed296a5fc287a37c2f940bab4cb051a
This commit is contained in: