Merge cherrypicks of [20102337, 20112255, 20112112] into tm-qpr1-release. Change-Id: I72368aa9ccfb755db9bb4bc5a93dfa84380a4c5f