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

Change-Id: I9e449f8ebccbe6e372e46a238f581cd9c2d599f6