am 1bd8111b: Reconcile with ics-mr1-release

* commit '1bd8111bbc62278d5025de8ba5e3418b7477d8a2':