Fix issue used to crash on MIPS/X86 device. ARM device works by accident Change-Id: I401f4954841b6f59d3ea001e5e6a70c46045a7e1
Change-Id: I0fb56c1fd1aa82d5a7c4da5010e00e103146ba78