Merge "merge adb unit / stress tests" into jb-mr2-dev