am e4f00342: am 21cb1290: Reconcile with ics-mr1-release

* commit 'e4f0034226731724b67201d69fb4034ef857e2d3':