am ee87007e: Reconcile with ics-mr1-release

* commit 'ee87007e15b1c171911e43713582efd9b187d205':