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

Change-Id: If4c101905988549eb3f5f5dfa8a64ad03ae4048a