Merge cherrypicks of ['googleplex-android-review.googlesource.com/27165336', 'googleplex-android-review.googlesource.com/27326561', 'googleplex-android-review.googlesource.com/28406661'] into 24D1-release. Change-Id: I36936a36fb4269b58c08ea815ddeafa952e9a329