Merge "Add more information to WTF to investigate bug 37809561" into oc-dev
am: e497b698d2

Change-Id: I0d5ace9d9b302e8f924d096fb245a81a3dfa8568