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