Merge "Prepare pass_through mounts" am: fc48a62d4c am: 92241d52ec
am: 5d49692df8

Change-Id: I35b7f385eca75423d2a00563894b07847090b3c0