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

Change-Id: Ibb4079baea932f9ebb9e7939c47242ff52e9994c