Merge "Update Search UX for OC" into oc-dev am: 0cdade8a78
am: 61255c0c93

Change-Id: I87d9dc74413d8ba34f7ab72dc047f1b29485e74a