Merge cherrypicks of ['googleplex-android-review.googlesource.com/22338474', 'googleplex-android-review.googlesource.com/22757815', 'googleplex-android-review.googlesource.com/22775991'] into tm-qpr3-release.

Change-Id: Icd14eaa30d62f3e86455adeb13a2cf933a69a150