Merge cherrypicks of ['googleplex-android-review.googlesource.com/26942727'] into studio-jellyfish-release.

Change-Id: I2aa5d2cb4ecdf011ad3ecaae51c1dada2fea9057