Merge "Add permission checks to getActiveScorerPackage()." into oc-mr1-dev
am: 66042e0caf

Change-Id: I8a090f5dfbdc6d47de9838d8c8bf48f95d831531