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