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

Change-Id: I1a7f688fabc005ba48f4e9739ab400fef55b40e1