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

Change-Id: I093b4355a7d8ba0c48ebfdc448fe6971ff3a264a