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

Change-Id: Ib6f63cfc52e4d8a1f13d1ce4041c62d6472e968a