Merge "Make default permission checks in performance service more restrictive." into oc-dr1-dev
am: 9481328acc

Change-Id: I813414e808bc1f7a04ad4f457f291bffddfad43f