Merge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev am: 6173fbe12e am: 6a845fe056
am: 1d9e95553b

Change-Id: Icb9e0c7261da6147d7d70be9f243fb387799c58f