Merge cherrypicks of ['ag/20865905'] into tm-qpr2-release.

Change-Id: I4a8ed9cbbb7a878d05d0ce1a98ca138bccb7fc63