Merge cherrypicks of ['googleplex-android-review.googlesource.com/22815560'] into tm-qpr3-release.

Change-Id: I5570c93c08339d78cf0b66909d62a4bddfcfad2c