am d0d7086f: Reconcile with ics-mr1-release

* commit 'd0d7086fb6012b72731fcefeabe92edccaaf89eb':