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

Change-Id: I3a1a2ca5006b81b4c3bef31af915be727da22db6