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

Change-Id: I93213ba09a855945301556ad149220d360ff8f29