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

Change-Id: I2ef7ea000d0cc65becb40a8ecdd9d1859758c944