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

Change-Id: I380754f676c81980a1126dda1c6232d285f3d0af