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

Change-Id: Ib7099ffba70191c457e755c6daed587816ffb591