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

Change-Id: Iaeeb3a4bb9b1148fc54bbe41ed79f4b304ccb57a