Merge cherrypicks of ['googleplex-android-review.googlesource.com/23474144',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23474144', 'googleplex-android-review.googlesource.com/23476871', 'googleplex-android-review.googlesource.com/23733070', 'googleplex-android-review.googlesource.com/23905120', 'googleplex-android-review.googlesource.com/23834017'] into tm-qpr3-release.

Change-Id: I4b0929a542f63be8e187d9049ef7d948e55f012f