Merge cherrypicks of [20141304] into tm-qpr2-release.

Change-Id: I49ec5854ba52da5fe0f3e01bb90c8a7b50c2002e