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

Change-Id: Ib8ee36fbe6add02de31ac5e5f6ace200ba1897d9