am 6bfcffce: Reconcile with ics-mr1-release

* commit '6bfcffce4417ac01d7ba1bbc6dc98c85bca2dc8a':