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

Change-Id: I39a143db317b2cb51b13825c8a71c5afcd72bc7a