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

Change-Id: I23115d8b005f87e0de24efba20ae2e8f13e5acf5