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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23186010', 'googleplex-android-review.googlesource.com/23152778', 'googleplex-android-review.googlesource.com/22726306', 'googleplex-android-review.googlesource.com/21609715', 'googleplex-android-review.googlesource.com/22581496'] into tm-qpr3-release.

Change-Id: I3f18a7e729469a5d10a4a910d67687acf27594ab