Merge cherrypicks of ['googleplex-android-review.googlesource.com/24325778'] into udc-d1-release. Change-Id: I105324d7c38d5caf0063a4bb7443b15b9cc90c6e