Merge "Resolve difference between studio-1.2-dev and gradle-dev test" into gradle-dev