Merge "Add more logging for b/64759619"
am: 70869206e4

Change-Id: I42a69023fb6425441e65f75303c355fd2201f6c3