am af23ed32: am 3e68d87d: am f8814489: Merge "Update compatibility library tests" into jb-mr1-dev

* commit 'af23ed324ab174383b6c3db4cd9c47b1968b87b5':
  Update compatibility library tests