Make "count" optional

Change-Id: Ib0b53d2f768bf5a66efd6d885c3408847e0429da
Merge "Make "count" optional"