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