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

Change-Id: I0239701439c06bcd62edfa110e3b33c18e6b2ad5