am 6668958c: am 1bd8111b: Reconcile with ics-mr1-release

* commit '6668958cbe9aca2c8930020e9acad9ef1bf045a8':