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

Change-Id: If7de9cb32a3cfa1597574c7b049335d5d7c9d0dc