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

Change-Id: I9a52aebe46328e3f0815b3ecc4d902da2784c0a7