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