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

Change-Id: I2949b96c5cc9f05c258041318c8ac91b977e9caf