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

Change-Id: Ic475f6b2145d7a1056cde4b151f565d94c7bbc61