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

Change-Id: I82c588c63d98eda45b0c7a35bd9057b2b9f5d9eb