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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/22815560', 'googleplex-android-review.googlesource.com/22794847', 'googleplex-android-review.googlesource.com/22791220', 'googleplex-android-review.googlesource.com/22779400', 'googleplex-android-review.googlesource.com/22569796', 'googleplex-android-review.googlesource.com/22670803', 'googleplex-android-review.googlesource.com/22885816'] into tm-qpr3-c-release.

Change-Id: Ie66f8fc640cc38b85fc338b10dda4b5b8fa7979d