Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev am: 48e839074e

Original change: undetermined

Change-Id: I05aeb30cc6ba6946c4d9b6c1607346efe6f60763