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

Change-Id: I7aee4a4db422fa2bdfc7deab110e92090f5c97e0