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

Change-Id: I86cd7a7d5713fd18805fea95b5e7bee883f74d6e