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

Change-Id: Ibbab16f3def30a9d75599029ecae8c35b8d7dad8