am e3281dc1: Reconcile with ics-mr1-release

* commit 'e3281dc1204eb3d2c6c8baf920386d8b0a8643e0':