Merge "Further improve debug logging for 77342775"
am: 8571f2679f

Change-Id: Ib81317c4af7971d0ab5306dc5efa2c7a400c5ff3