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

Change-Id: Ida003f9fd24c5f08576206b8cdc1d4edac6d8a58