am ca5caa98: am 6a260438: am 5fc13875: am 34a72cb0: Fix ECM issues

* commit 'ca5caa98da5fca28d217f981caf0d1b2ac575790':
  Fix ECM issues