Merge cherrypicks of ['googleplex-android-review.googlesource.com/25171612'] into udc-d1-release.

Change-Id: I0dbdd5a53bbba667aedb96eb48fe09c9abf1a743