am 5dee771f: am 8e069a7f: Reconcile with ics-mr1-release

* commit '5dee771f29e8649f41f17bc765dca7705af02e8d':