Merge "[automerger skipped] Prevent using invalid result uri during multi user...
Merge "[automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90 -s ours am: 373b53a7 -s ours am: 1d48089a -s ours am: 963c9391 -s ours" into sc-dev