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

Change-Id: Iec2f8dce2501473bef80c788723b7a063dff4b33