Merge cherrypicks of ['googleplex-android-review.googlesource.com/21351238', 'googleplex-android-review.googlesource.com/21259403'] into tm-d4-release.

Change-Id: I02dcf172d16418c638a1ee1e73e2ea509ebf64c0