Merge \\"Temp fix to split header and position count behaviour for watches.\\"...
Merge \\"Temp fix to split header and position count behaviour for watches.\\" into nyc-mr1-dev am: 5985e3f9
am: 5c304750
Change-Id: I1c5ca571e461b6d82480b0738c2924e0e20521d8