am 56acfe35: Reconcile with ics-mr1-release

* commit '56acfe3504249002cb46ab2fe06d420884034444':