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

Change-Id: Iecbc77f188c45505c5a0893248ed49113e3b5972