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

Change-Id: I0e22da03e1d88a79b9e5e1359fe3837ce72fade9