am 8180c9e6: Reconcile with ics-mr0-release

* commit '8180c9e66a124e9a6d28fa925aa04bc0f0c275b3':