am 62aaf5c8: Reconcile with ics-mr1-release

* commit '62aaf5c86255fe6830a659dd1fb7982b4db5a9e0':