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