am 336658c3: Reconcile with ics-mr1-release

* commit '336658c321a6f15f121514342b0a508d84b4b415':