Merge cherrypicks of [19564662] into tm-d1-release.

Change-Id: I1b7a31d59647ad46c014b1d00dca34138287b1d7