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

Change-Id: I1d8e6763a2b7c39e3ad64408ed9b0bfdb772af9e