Merge cherrypicks of [18750966] into studio-ee-release.

Change-Id: I54602783b742bf1ddf47d77671d3a60a3aa0dcdd