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

Change-Id: I0296f7824ff2200da9eb5bd0d820923b31c0dab1