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

Change-Id: Ifc3e631250c5ad8a24b5a1d2708d38f41126e8c6