Merge "Update SDC jjb"