am c231241f: am 1a811ef5: Reconcile with ics-mr1-release

* commit 'c231241f1c10df9bd6758a3625ffd51f17a343ec':