Merge cherrypicks of ['googleplex-android-review.googlesource.com/22698622', 'googleplex-android-review.googlesource.com/22808758', 'googleplex-android-review.googlesource.com/22845477', 'googleplex-android-review.googlesource.com/23012900', 'googleplex-android-review.googlesource.com/23053589'] into tm-qpr3-c-release.

Change-Id: I35f545ce2c49a8c5f0bfbd7a56d7c2c1afb8f17b