Android Studio Electric Eel (9474842)
Merge cherrypicks of ['ag/19847187'] into studio-ee-release.

Change-Id: I87ab0841cd5554502d90a449fffe8c9752a2b485