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

Change-Id: If6e3d82d98b45cf835fbe9fffb4d8936e148207b