[automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct argument order in permission check" into pi-dev am: b2964b2956 -s ours am: 8b98bdc834 am: 6b4e794ccd
am: e74647d677 -s ours
am skip reason: subject contains skip directive

Change-Id: I75f9b0c3145812ea00b576bebd7edbbd5cdbf02a