Merge cherrypicks of ['googleplex-android-review.googlesource.com/20729654'] into tm-qpr2-release. Change-Id: I8ea402bab9c0a24212992294e9f1354b58582a0f