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

Change-Id: I44c5504ba34c8b6f16901ac5d70073a3e69871a3