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

Change-Id: Ifbf34b586595e9ec4e2269e5bb5f039fe8b46abf