Merge "Remove MODULE_LICENSE_APACHE2 from QuickSearchBox" am: e78523f5f0

Change-Id: I5f3ff193f0909d9ea944cf0d1fbee747dbe47bd8