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