am 113067e2: Merge "run-as: build 1161573 failure"

* commit '113067e2161e206482e80cfa9b58eeca02e0f6b6':
  run-as: build 1161573 failure