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

Change-Id: I0e5c0f7d22a2a8a789639f36e51c134cc6ed4850