Merge "Tools version 24.0.2 -> 24.1.2" into studio-1.1-dev