am 176eb17c: Reconcile with ics-mr1-release

* commit '176eb17c88caf1bb3f2641dfd0bd6cf68eaf53d3':