am 8544aac8: Reconcile with ics-mr1-release

* commit '8544aac859400ee7c0109f996930b22455028dbe':