Merge "[automerger skipped] Merge "Move permissions from base to standard manifest" am: 95c5375a85 am: f076210032 am: ad7cdd2bd3 -s ours am skip reason: change_id Ica63ce586e701b1f2415a97f63ba27cc25e4830a with SHA1 d4cbba8f18 is in history"