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