am 3407aafe: Reconcile with ics-mr1-release

* commit '3407aafede66786616436dff0c448a77746f60aa':