Merge cherrypicks of [20270804] into tm-qpr1-release. Change-Id: I4694c7f80cd389132c0b3d58861ce054df401526