Merge cherrypicks of [20120631] into tm-qpr1-release.

Change-Id: I949c5048d41629c7833e37c1fb23ea8e07a1e413