Merge cherrypicks of ['googleplex-android-review.googlesource.com/21546150', 'googleplex-android-review.googlesource.com/21546151', 'googleplex-android-review.googlesource.com/21546152'] into tm-qpr2-release.

Change-Id: I27e5de5cfa3fe903725dbc0e19150473ee2fedb0