Merge "Update jjb for SO"