Merge \\"Always trigger a write if no pages are written\\" into nyc-mr1-dev am: 965a706282
am: 0c1814a153

Change-Id: I7d7021e4ff9074bf60c22caa2b897245fe8a5f4b