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

Change-Id: Ic0ea5b6c97616b0f9f2ce9d5e65dcfd7fbb4751e