Merge cherrypicks of ['googleplex-android-review.googlesource.com/27876721'] into 24D1-release. Change-Id: Ia44556afdf593fe9ed3d944c7b8d3516b06f5b50