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

Change-Id: Ib5d5aef8a426f59b698723c70edf776b8c535fcf