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