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