rebase to content-sources branch HEAD.