Merge "Fix kernel panic when boot up" am: 857a9f9a57
am: a28eba452f

Change-Id: I5c7dc9d6aeeefeef116eea216247b793d72a1c3e