Merge cherrypicks of ['ag/19847187'] into studio-ee-release.

Change-Id: I685db26b0fbca9b2ad61189c824536171b86d2f9