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

Change-Id: I5a2b745e9943166ce33bf5146033d06d3e2b60a2