Merge cherrypicks of ['googleplex-android-review.googlesource.com/22633469', 'googleplex-android-review.googlesource.com/22438869', 'googleplex-android-review.googlesource.com/22625067', 'googleplex-android-review.googlesource.com/22772854'] into tm-qpr3-release.

Change-Id: I1e4fc79a2dd53c98d681218b35ee9d0f548fa82f