Merge cherrypicks of ['googleplex-android-review.googlesource.com/21408331', 'googleplex-android-review.googlesource.com/21987133', 'googleplex-android-review.googlesource.com/22077343'] into tm-qpr2-release.

Change-Id: Ie4c4b4bc28cfe4bf0213829dc1bc66af7b871717