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

Change-Id: I3622cf86cced6a96cc5369d1d2d2219c6b39ea5c