[automerger skipped] Merge "[RESTRICT AUTOMERGE] Correct argument order in permission check" into pi-dev am: b2964b2956 -s ours am: 8b98bdc834
am: 7945d755aa
Change-Id: Id340b7199d6656225d72bcfbf32f736ef2501f11
This commit is contained in: