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

Change-Id: I997bcdbacf7a0636f5096f7ddcd43335486acff9