Merge "Work on issue #36863299: [Fugu] CTS: PermissionFeatureTest failures:..." into oc-dev
am: 8eb76853e6

Change-Id: I6432c7e742fc2ac1a440c0986ad154e7a6c5e6c5