Merge "(P) Revoke permision when group changed" into pi-dev
am: 7081085d6d

Change-Id: I97fd9bb2f15f7adfead96efd8475a9af0b127cf6