Platform Tools Release 29.0.2 (5738569)
Merge remote-tracking branch 'origin/temp_master'

Test: make
Bug: 133171083

Change-Id: Id6387c82ea2775d31f88d3404ab91c4fd7d68998