Merge cherrypicks of ['googleplex-android-review.googlesource.com/25383593'] into udc-qpr1-release. Change-Id: If88d54075fb89226b89d785ebbe2a1d62906ef2a