Merge "run-as: build 1161573 failure"