am a14a22f4: am c6343adf: Changed class paths for classes moved in unbundling effort

Merge commit 'a14a22f479ea08b56c8abcc3b75b54f0d5f1e3f8'

* commit 'a14a22f479ea08b56c8abcc3b75b54f0d5f1e3f8':
  Changed class paths for classes moved in unbundling effort