Merge cherrypicks of ['googleplex-android-review.googlesource.com/29779920', 'googleplex-android-review.googlesource.com/29908258'] into 25D4-release. Change-Id: Ic1d64ebe714ca176d86d03c022ca56deb6e15215