Merge "Merge ab/7633965" into stage-aosp-sc-ts-dev