Merge "Completely fill in permission info" into pi-dev am: fdc891e2af
am: f73695fb1d

Change-Id: Ia1ca886b361a3769aaefa7b4e9fccb275f735847