More tracing for b/133009122 am: c25d975342
am: 1b0b3aa1ba

Change-Id: I2812647e8048739b66c7267f0a480cea273c32ec