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

Change-Id: I3595dc012a91a531c1252cd6212b38c12ad76fef