[automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct argument order in permission check" into pi-dev am: b2964b2956 -s ours
am: 8b98bdc834

Change-Id: I24041b45319d49a19b52f189bda07c322b02e99e