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

Change-Id: Ie8fe5273a357a16a23f393cc0f2364285b4155b0