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

Change-Id: Id21676b0e0fe9cb67474fa977f58e6c647db4fa8