Merge "Move QuickSearchBox to /product" am: e5ac43dbf0 am: dc9ba5606d
am: eb9d479d9a

Change-Id: I3d94a2876ad330652953b1238bc93aee0998cb14