Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev