am cbd78651: Reconcile with ics-mr1-release

* commit 'cbd78651ba6c8a9c6c2cac5c7872b35bbd5b355a':