Merge "Fixing breakage caused by 121088" into studio-1.1-dev