Merge "Update compatibility library tests" into jb-mr1-dev