Merge cherrypicks of [20271533] into tm-qpr1-release. Change-Id: I72612879f0bbe7a6c4cfef3e9006305f7fcc5fcd