Merge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev
am: 6173fbe12e

Change-Id: I9f8435dbdee7c532c68542e5a1de75e97dfc6dea