Merge cherrypicks of ['ag/20985144'] into tm-qpr2-release. Change-Id: Ic929eafef429fcaf53554f76f85524df2cf3ef8b