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

Change-Id: Ia0d4e1efe616e821d372f2849ce4ce4e0074e340