[automerger skipped] Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876 am: d3409a37ae am: b5af3bfb78 -s ours am: da47a6cc20 -s ours
am skip reason: Change-Id Iae9c273af822b18c2e6fce04848a86f8dea6410a with SHA-1 4c36a00d58 is in history

Change-Id: I9b95f9715b7d15e3f430e6c46a2fd975b6b51f23
tree: e109314b90cdc9eb906d0903b1985abba8f5f113
  1. core/
  2. services/
  3. tests/