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

Change-Id: I99b455f936d4f1943e961b6e3672d685151a510d