Merge "Fix run-as for non-owner users" am: a123155f3e am: 7dc5d6c950
am: a5fca3c0fb

Change-Id: I8f0ef4975e169a5207fa481056bd49eaf1db8300