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

Change-Id: I4083a63402e63600ef6dea331e1b140843690b86