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

Change-Id: I5aebe2f67ad5f0f748db1b45c2b4ad6a1c4df530