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

Change-Id: I439b5fb2d7b53b72aebb358631c3e1ea4d99ead5