Merge "Add logging of written frame counts" am: 8080b95b4b am: 0ffafe860c
am: 6cde33e2b9

Change-Id: I3849d0c40a6a754dcfa3f61319e4674e3084f82d