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

Change-Id: Idabc5ea28f9ca34627737748670cc77be958b5bd