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

Change-Id: I7f1fdba02c95c159c6637f5de213a838e9bce341