am c14ea96f: Reconcile with ics-mr1-release

* commit 'c14ea96f2f4e36f7a3b3d9676df845afb09c2245':