Merge cherrypicks of [20075314, 20189657, 20297390, 20377068, 20392273] into tm-qpr1-release.

Change-Id: I84be122e3754990c4575d15c7e7c558c83becb42