Merge "Use global-jjb verify,merge"