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

Change-Id: I37849bc0cdef4ba726f3d076fd5ee05be7508d6b