Merge cherrypicks of ['googleplex-android-review.googlesource.com/24303963', 'googleplex-android-review.googlesource.com/24303958', 'googleplex-android-review.googlesource.com/24433390'] into udc-d1-release. Change-Id: I096d1a989e72800b226f013774c9b861f1dcd1c4