Also regularize cross-user call handling throughout. Bug 27743435 Change-Id: Ibc530d0576d657723a613888357a6ea71b482763