Merge cherrypicks of ['googleplex-android-review.googlesource.com/20379868'] into tm-d4-release.

Change-Id: I9bcbec0888504617d4eab24c076e2a53e3dbeec7