Merge "Start serial console at the 'init' trigger" am: c70fc1cbfd
am: 21fd368dc2

Change-Id: I7e30865212c225fd81047ef5dcb75eb87417d112