Merge "[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 10599ad255 -s ours am: 691899084c -s ours" into sc-qpr1-dev-plus-aosp