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

* commit '31dfb4c12cc7a4193f2cfa20d1ba20387b1a2887':
  delete obsolete duplicate files