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

Change-Id: Ie0a3a2b93d30278a94893c3b513befaa5edf32ca