Merge "Fix search after upgrade" into nyc-dev am: f96b594
am: 31c0cfe
* commit '31c0cfe2f23c045b0d76155994d6085ee4bb58a6':
Change-Id: I06bb0c22f33e9ddde016242f97809d8b17f4fb9d
This commit is contained in: