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