am 152c7479: Reconcile with ics-mr1-release

* commit '152c74792b2ba22611bd4994bd9a7a2de1e97f76':