Merge "Address API council feedback on ContentionTimeStats API" into sc-dev