Merge "Prevent search crashes from uninstalled apps" into oc-dev
am: 6d537b6767

Change-Id: I21b6bbf8a2c22fe98e0a2f03fc3f95cb9edc225e