Merge "[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 377a3f555c -s ours am: a4b53a5a62 -s ours" into sc-qpr1-dev-plus-aosp