Merge "First-stage mount: avoid triggering a FATAL error"
am: 78393951de

Change-Id: Idac1a2c9b922308ec8861c15979e29184dde5bdb