change dependencies
Merge "change dependencies" into jb4.2