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

Change-Id: I577b801cba80cb6fe3dbf032fd28c101116d40a1