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

Change-Id: I77eac27d279ec3a73b81bba5aca00c1a1225bd1e