Merge cherrypicks of [20102054, 20111318, 20112890, 20112181] into tm-qpr1-release.

Change-Id: I5f64396d7269ab1d58d9d96db7792c71729606fe