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

Change-Id: I7cec7e5d6635d4391fdc219c571490a3bda591d2