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

Change-Id: I0ee9abc313e868db37604a980dfa764a399ec0ca