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