Merge cherrypicks of ['googleplex-android-review.googlesource.com/31864495'] into udc-car-lts-release.

Change-Id: I7ce4531f04d6a8c7380df7a649d76a99257601df