Merge cherrypicks of [20290590] into tm-qpr1-release.

Change-Id: I89240ab936775bf286da6cfaa18b95b29bfa5430