Merge cherrypicks of ['googleplex-android-review.googlesource.com/23563580', 'googleplex-android-review.googlesource.com/23728493', 'googleplex-android-review.googlesource.com/23545218'] into tm-qpr3-release.

Change-Id: I01fe9e402e6b6b0d99fbae48e95918193ece6d29