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

Change-Id: I8d2f0691cd6d6907ee1afcd4803438795922296a