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

Change-Id: I4dae42a28994a9c4f7990fcecd0fe011724ce74e