Merge cherrypicks of ['googleplex-android-review.googlesource.com/27021765'] into tm-platform-release.

Change-Id: I458f0407d7dc35753afe76055b6b47feb1590376