Merge "Merge "Refurbish granting mechanism" into oc-dr1-dev am: a4a68a1481  -s ours am: 494801aba5  -s ours" into oc-mr1-dev-plus-aosp