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

Change-Id: Ic5d7aa2ed46828a29153cae6a457ff80efb57f58