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

Change-Id: Id69d630c13674442c535fb058c5464bb1142ed03