am e205386e: am 66e965dd: am 2377da02: Merge "delete orphaned and obsolete files" into jb-mr1.1-ub-dev

* commit 'e205386e1ef1364977fe9c0aeb5bf0d6dbe0fd44':
  delete orphaned and obsolete files