Merge commit 'f5052f015677e9499e6841c54959e8005bdf45ee' of sso://googleplex-android/platform/packages/apps/QuickSearchBox into HEAD
Change-Id: Ibcbe0cde3637d52e27b3092628ca9ffe121dfc8c