Merge "Fix out_write frame count to match return code." into nyc-mr1-dev am: f6e202f58f
am: 6beade6ea4

Change-Id: I51ea1f5ebd0f85c83dbe65a7febd1c7c11e0d663