Merge "Platform tools 33.0.4: rev bump"