Merge cherrypicks of [20026125, 20112204] into tm-qpr1-release.

Change-Id: I7c2411ecb8c2f065f15b8a4d3bf794897b77652c