4.2.2 fixes round 2

booting and working

Change-Id: Ic75cb738fafc301d22a0c4cec8b71a749962cf89