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

Change-Id: Iedfd36ad1c8069607638e35c50adeb35a5add8cc