Merge "Allow permission group updates" into nyc-mr1-dev
am: ee2df0390e

Change-Id: I1c88a2863ddb2a60d94a5a84d49103789b849d42