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