Merge "Refurbish granting mechanism" into oc-dr1-dev-plus-aosp