am 62d002d9: Reconcile with ics-mr1-release

* commit '62d002d94248bc07e5bbdb71a88c48c7da205755':