Merge "Update change annotations in Object(In|Out)putStream." am: 58b1654b67
am: 669a908df7

Change-Id: I0619595b474ea5ecaf180cb5a11c8589a15fe765