Merge "Need to revert this one and cherry pick earlier CLs first" into studio-1.0-dev