Merge "Update change annotations in Object(In|Out)putStream."