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

* commit '92285b9b9ab03ee8edb3fea6f1a70a191632f063':
  delete obsolete duplicate files