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

Change-Id: Ibd8ce27933e83565e1c05dbab3fbf06e352e19ab