Merge cherrypicks of ['googleplex-android-review.googlesource.com/22159882', 'googleplex-android-review.googlesource.com/22520854'] into tm-d3-release.

Change-Id: I2be63ab8f9fcdbb0cd226ca8354012b7d56f997c