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

Change-Id: I64afa6b17b073b955daef1dd167d00562a0bfb79