Merge cherrypicks of ['googleplex-android-review.googlesource.com/20728925'] into tm-d4-release. Change-Id: I58f5811b00ccaa3cbd44128595216678afe4c729