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

Change-Id: Ic6d95e420200403c32bc7def1043b8198f171fbe