am 15d81475: Reconcile with ics-mr1-release

* commit '15d8147525f7ce18aa1670d83a46f886be416321':