am 5fc13875: am 34a72cb0: Fix ECM issues

* commit '5fc1387595795181a9d38677f2014f909d30dd84':
  Fix ECM issues