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

Change-Id: I6066bcb72a430cbea2667d4d2b7a4092cd96dc62