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