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

Change-Id: I4c353a82ec3f0f93275e3a13e28718738c228977