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

Change-Id: I179057dda7ab0d32c363f63cc2f02ee5a6ef08e3