Merge cherrypicks of ['ag/20535613'] into tm-qpr1-release.

Change-Id: Id27e73e63d4fcb78b47cf47acb4e1672616b06a9