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

Change-Id: I7108ca0715fa174206f3821ae0ddeb037884badd