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

Change-Id: Iac834c580de5ea002c86e3f9ecbb986cde60d875