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-c-release.

Change-Id: Ie1f4af32048525c35915605dcfdb4c4ab41a2878