[automerger skipped] Merge "Mount product and system_ext for emulator" am: 7373e57811 -s ours am: 94c5982643 -s ours am: 1b2a1316fe -s ours am: 3e77727455 -s ours
am: 4f3d769c4f -s ours
am skip reason: change_id I26fd6a81320711b961d8dc1ecfc5b8f305d8530d with SHA1 d6bf571119 is in history

Change-Id: Id5ce544ef24eb1b8fe66956066300ee932304d5a