Merge "Remove default app duplicates in search" into oc-dev am: 0c55014b88
am: 79cfaa7b91

Change-Id: I1beb3569054d6acbcd9f22d112031de51b862dc9