am 6b1dade9: am d58f3d2b: Reconcile with ics-mr1-release

* commit '6b1dade9c64196afc357d2843528b5efc826a262':