Merge "TimeAdjustTest: Use dataProvider"