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

Change-Id: Ic44c2194ff8430482bbd2b6aa9b77096200f5d0c