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

Change-Id: I63e50cc4f9fbd38d3e614fc453ad9a3be452def4