Integrate jSAF changes for test target.