Merge cherrypicks of ['googleplex-android-review.googlesource.com/25372729'] into udc-d2-release. Change-Id: Idc3013245529474b3813423fe1ce5858556b84b3