Consolidate permissions location

Change-Id: I48c39e14d9db4ef37ba78ec3a96a440f59a60b91