Merge "Change protection level of companion permissions" into oc-dev
am: 897f883409

Change-Id: I5b123b603debc11a6ef0ed12a5f6da5d0c3ee533