Merge "Amend owner files for releasetool scripts"