am 9bb6dd28: Reconcile with ics-mr1-release

* commit '9bb6dd28e0bda29c38313adc4f4627abf4407014':