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

Change-Id: Iee390ee0b79b852b2f40f0482ab7e537715745a1