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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/20606225', 'googleplex-android-review.googlesource.com/20617177', 'googleplex-android-review.googlesource.com/20617178', 'googleplex-android-review.googlesource.com/21421885', 'googleplex-android-review.googlesource.com/20995769', 'googleplex-android-review.googlesource.com/21328653'] into tm-qpr2-release.

Change-Id: Ie67b587ac3412fef382856a926110dbc7c3a9381