Merge cherrypicks of ['ag/20410007'] into tm-qpr1-release. Change-Id: Iab4b653da4c32ad416193d34beb2d5c7c7aa9b9a