Merge "[automerger skipped] Merge "Merge stage-aosp-sc-ts-dev before making it...
Merge "[automerger skipped] Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev am: 0f76d3b8 -s ours am: cdd4130a -s ours" into sc-qpr1-dev-plus-aosp