Merge "init: skip early mount in recovery mode" am: 8951c1313d am: 6befc485c7
am: f00d05610b

Change-Id: I8a7dd60f99cfcda88b01892c129af24e3f61a3aa