am 1a811ef5: Reconcile with ics-mr1-release

* commit '1a811ef51e3ebd516224c3de6b319b9e63e4f7bb':