Merge "init: Format userdata_gsi if needed."
am: 212693c7ae

Change-Id: Ia12d9de29dc59fd34c69d16579b7461128e4be34