Merge "Updating test build rules" into sc-v2-dev