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

Change-Id: I5b66b1065ef2c6eb942ea2592949c9d8bfe53cb1