Add tracing for b/134532571

Bug: 134172603
Bug: 134532571
Change-Id: I75c8e0212a9b35d33842d5380fbe733b486be932
5 files changed