am 078efbef: Reconcile with ics-mr1-release

* commit '078efbef251ceed0d00b696236f58610b8387839':