Merge "Include failure reasons in FATAL logging." am: 57c78074bd
am: fd72194b3a

Change-Id: I448c9b7e57e86269eb47a598f725bce99816f672