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

Change-Id: If206677e835ca5579aa84818797e6b6527a3b273