Merge "Update global-jjb to HEAD"