Improve debug info.
am: 3bbb0cb62f  -s ours

Change-Id: I443c902f7c5035ed1f6d064de6e74c4c2733cef8