am 588d0af7: am 7a57918f: Reconcile with ics-mr1-release

* commit '588d0af721397a662c03fe40df2ab70b3c2c5eec':