am 2bd33ae2: am 941c3a22: Changed class paths for classes moved in unbundling effort

Merge commit '2bd33ae26e7cb30fc927a0b68faa91126e84360a'

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