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

Change-Id: I76aee6b6a9a9261a0f42e7a825ace65198f15e5a