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

Change-Id: Ie9e199acaa9577ad72c6d57cc6cbc1be895fb4a4