[automerger skipped] Merge "DO NOT MERGE Adding logs to help debug Tap to read issues." into pi-car-dev
am: 51e99c3442 -s ours
am skip reason: subject contains skip directive

Change-Id: Icbef037932523f288eb540ae01c8af443dd828be