Merge "Revert submission 9996524-restrict_legacy_appop"