Temp fix to split header and position count behaviour for watches.

Bug: 29010414
Bug: 29244476
Change-Id: I5c8616304e7d44f423636612670d9187ad030679
1 file changed