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

Change-Id: I928fac1241d24e099ca00c735a5f83c18804d009