Merge "Revert submission 10012772-revert-9996524-restrict_legacy_appop-YHMXHGIDDF"