am 5477d33e: Reconcile with ics-mr1-release

* commit '5477d33e187d66961453399c53093bd18297013e':