Merge "Remove bootstrapping the passthrough mount."
am: 58bd37f1e3

Change-Id: I31db20bfedf19311c1146d0ae3420a72ec23e8e5