Merge "Testing java compat lib for RS." into jb-mr1-dev