am d5280e51: Reconcile with ics-mr0-release

* commit 'd5280e51aa4578ff47bffc166f74d79c17358589':