Merge cherrypicks of ['googleplex-android-review.googlesource.com/25927691'] into car-apps-release.

Change-Id: I710af1974db687479f60cdc6e15591482f5e0459