Merge \"Explicitly flush compress/encrypt stream before close\" into nyc-mr1-dev
am: 69818781f3

Change-Id: Ib31ffe531a4c6d27f10d1432c8ab68507c14abaf