Merge "Revert "Grant only requested permissions not the whole group."" into mnc-dev