Merge "Allow user to change AiAi's permissions." into pi-dev
am: 80f0481628

Change-Id: I31410b69de5de58549e3c218888117abefc3924c