Merge "Increment platform-tools version to 29.0.4." am: 2e9deae47f
am: 5b0bfe3708

Change-Id: I883bcfc9803743e646bfd36d79dc8773c13ec5ac