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

Change-Id: I405eee324c6e855ee3feca556e06221e94bd77d5