am 4db60250: Reconcile with ics-mr1-release

* commit '4db6025083ff4abff3e682d6b81ca40bf7e843fa':