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

Change-Id: I6a83ddf2be157b8d1f67dffcc2782eb4e17ffdb5