Add a count for raw bundle data

Change-Id: I380c1e9ae61cba2ff02e4e380c3046ecc889f6aa