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