Merge "Relax enforcement of GET_USAGE_STATS permission." into oc-dev