Merge "Refurbish granting mechanism" into oc-dr1-dev
am: a4a68a1481  -s ours

Change-Id: I271d71fe2b7cc35e79e7d0811700c91e3ba0fb1c