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

Change-Id: I4072e8c97b7ef281c288cac251302dfe0c191844