Merge "Merge 10952656" into aosp-main-future