am d784e409: am 31dfb4c1: am b7d1f69a: am 84668136: Merge "delete obsolete duplicate files" into jb-mr1.1-ub-dev

* commit 'd784e4091bfa043e5bb78423848c0b3e7fd38185':
  delete obsolete duplicate files