Merge "Add default permissions for GLOBAL_SEARCH" into oc-mr1-dev am: f876e789fd
am: 0b15e684ec

Change-Id: Ie4d78ad7c8d75d24965474f1eab2bc844d922f57