Merge cherrypicks of ['googleplex-android-review.googlesource.com/21694103', 'googleplex-android-review.googlesource.com/22076527', 'googleplex-android-review.googlesource.com/22082171', 'googleplex-android-review.googlesource.com/22235518'] into tm-qpr2-release.

Change-Id: I5be896ea69863c474ce1d3a3c65fcc90d7728468