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

Change-Id: I0366d1d912ecc6f9afc919942787d05a85be0a0d