Trebuchet: Fix permission strings

Follow the guidelines

Change-Id: Ia8f68c25d1a0b28dd3dc4500978a4f2223bdf1ba
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0