Merge cherrypicks of ['googleplex-android-review.googlesource.com/21947039'] into tm-qpr2-release. Change-Id: I6beb293ec471ad102cadffc498adb94e2081afbd