Merge cherrypicks of ['googleplex-android-review.googlesource.com/23722149', 'googleplex-android-review.googlesource.com/23722150'] into tm-qpr3-c-release.

Change-Id: I94247b8073a68f134e8b0416482f82b411081868