Merge "recovery: Drop the "--stages" / '-g' argument." am: 9bd1dced90
am: ecf5467a82

Change-Id: I05e330ba778ab29118cd5e1082a77eb5bf100e26