Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876

Change-Id: I4c255820617a86afdfa239febdd46fff7d082381
tree: 83a94463dc4d48795f21a5134c59383bc700a543
  1. core/
  2. services/
  3. tests/