Merge "Add '?' to permission group requests." into pi-dev
am: 2594933301

Change-Id: I0fed1dfec9caa4a80c4a38a4d9928b9d0f68c2c3