am 04b76422: am 3407aafe: Reconcile with ics-mr1-release

* commit '04b764227c8bcdabdd7faf82bc905422204ff187':