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

Change-Id: I5b8fca5589d3eee53547667040efd17003eaad70