Merge "first_stage_init: add console" am: ee148dd9c1
am: 69f21111da

Change-Id: I56e44d9612d5f437608339c31548c06c69f342c5