am 34a72cb0: Fix ECM issues

* commit '34a72cb033fcadf2d43322a5c66226873fbff700':
  Fix ECM issues