am fc7031fc: am 068436ed: Reconcile with ics-mr1-release

* commit 'fc7031fcb463593d0f799ec057f6da4e47fe0185':