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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/20064089', 'googleplex-android-review.googlesource.com/20831956', 'googleplex-android-review.googlesource.com/20828777', 'googleplex-android-review.googlesource.com/20642112', 'googleplex-android-review.googlesource.com/20709903', 'googleplex-android-review.googlesource.com/20899934', 'googleplex-android-review.googlesource.com/20920023', 'googleplex-android-review.googlesource.com/20322503', 'googleplex-android-review.googlesource.com/20953243', 'googleplex-android-review.googlesource.com/21129648', 'googleplex-android-review.googlesource.com/21005178', 'googleplex-android-review.googlesource.com/21414918'] into tm-qpr2-release.

Change-Id: I3a0d202607b0a89e6f6bf1b5dea1d14cfe773339