And make the search-enabled one copyable. Fixes: 127962713 Test: search Change-Id: I0867ea8a376e3aac5e94cd70245833b516bb154d