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