Merge cherrypicks of [20122571, 20130738] into tm-qpr1-release.

Change-Id: I4708b83cd24fe2d12749af66a31bdf8777d753d3