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

Change-Id: Icf0142c39e7fb4a0c84b979dda305047e2546267