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

Change-Id: If4a2f78046143d344bfeec40f62041433d4e5829