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

Change-Id: I33bea9a9617ba3fa7d9e975eb72e10c70084c296