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

Change-Id: Id1d16f72b84d6c4b8cc98a907e68a6c1b827b16f