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