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

Change-Id: If4663fd9f5ed8980090d55602cffb0e5f2054b16