[automerger skipped] Merge "Debug message fix" am: 15418261cc am: 04511a9f28 -s ours

am skip reason: Change-Id I5c886de22543188032df172810b987cff964577b with SHA-1 06d85c3da9 is in history

Change-Id: Iba1b854ac7b9d8460206ee79ef1475a28d94f5d3