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

Change-Id: Ieddbd6c960b4b79e1dc166369728c56a3aa0d9c1