Merge cherrypicks of ['googleplex-android-review.googlesource.com/26009078'] into udc-d2-release. Change-Id: I49ac94450dd6f40c4ef1bdd82269dd922c9b0ef3