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

Change-Id: I800542c2f77435562c7afdc5e04adfb83dbdd4ff