Merge cherrypicks of ['googleplex-android-review.googlesource.com/21326479', 'googleplex-android-review.googlesource.com/21326480'] into tm-d2-release.

Change-Id: I284bc18c1c300b5af4a8e6bf3a0cf001a89421f6