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

Change-Id: I673af2506d51945dc02f484efe98facfbe99b943