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

Change-Id: I5660cafce05a0e3c6edff03bd645d8df329c5d50
tree: f25822c4647ea1b7f86162d44db324dbafd9c91e
  1. core/
  2. services/
  3. tests/