am 1e40e843: am ee87007e: Reconcile with ics-mr1-release

* commit '1e40e8433d783e4f06be1fb4029fdceca1e7ad6a':