Merge cherrypicks of ['googleplex-android-review.googlesource.com/23583481'] into tm-platform-release. Change-Id: I47453a6b5c943e5384e5272b2e1cc9713eceed7e