Merge "Move permissions from base to standard manifest" am: 95c5375a85
am: f076210032

Change-Id: I022a4797ccd81d24dacd6b314305a43f299c86f3