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

Change-Id: Id046f9aef66e0217644116fe8221d05fe5e960a3