[automerger skipped] First-stage mount: avoid triggering a FATAL error
am: fe92dd0973  -s ours

Change-Id: I483b2b885de4c9310e509a591133269a14f4d619