Merge cherrypicks of [20542370] into tm-qpr1-release. Change-Id: I95f46a55e421ae40967a8eb93ba61d7565844a1f