Merge "Change NVHM protection from crash to Log.wtf" into qt-dev am: 5540281a6d
am: 6516c43ad1

Change-Id: I811cc5cdce79ab703ccdbe266a04bccf487f6dd9