[upstream] Update upstream to latest dev branch.