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

Change-Id: I4891871628a028b8d95c970b0940356247467bad