Merge cherrypicks of ['googleplex-android-review.googlesource.com/24699675', 'googleplex-android-review.googlesource.com/25176953'] into udc-release. Change-Id: Id3b756dfdb402f0f53b0276c17c8d9f7f0c6fc23