Merge "Increment platform-tools version to 29.0.5." am: 8c81029cbe
am: d45a8b14d4

Change-Id: I72739d6e71d665ed4ce5a44438b666db3945f85b