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

Change-Id: I905c1ab74b49d2d92292676df80209e3f4f3e541